From a434834c1e0fc8ef124580c6ae6571c5ebc7de34 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Mar 2012 17:53:56 +0100 Subject: [PATCH] tools/libfsimage: include Rules.mk first Move the inclusion of Rules.mk up so that things like CFLAGS get initialized properly. Currently only zfs appends CFLAGS. If CFLAGS get reset by Rules.mk the private settings are lost and compilation of zfs support fails. Signed-off-by: Olaf Hering Committed-by: Ian Jackson --- tools/libfsimage/ext2fs-lib/Makefile | 3 +-- tools/libfsimage/ext2fs/Makefile | 3 +-- tools/libfsimage/fat/Makefile | 3 +-- tools/libfsimage/iso9660/Makefile | 3 +-- tools/libfsimage/reiserfs/Makefile | 3 +-- tools/libfsimage/ufs/Makefile | 3 +-- tools/libfsimage/xfs/Makefile | 3 +-- tools/libfsimage/zfs/Makefile | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tools/libfsimage/ext2fs-lib/Makefile b/tools/libfsimage/ext2fs-lib/Makefile index 142207f63b..957279db6a 100644 --- a/tools/libfsimage/ext2fs-lib/Makefile +++ b/tools/libfsimage/ext2fs-lib/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = ext2fs-lib.c @@ -11,5 +12,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ext2fs/Makefile b/tools/libfsimage/ext2fs/Makefile index 8ff4c71a1c..714651eccd 100644 --- a/tools/libfsimage/ext2fs/Makefile +++ b/tools/libfsimage/ext2fs/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_ext2fs.c @@ -9,5 +10,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/fat/Makefile b/tools/libfsimage/fat/Makefile index 2911a0e0e7..950181b403 100644 --- a/tools/libfsimage/fat/Makefile +++ b/tools/libfsimage/fat/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_fat.c @@ -9,5 +10,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/iso9660/Makefile b/tools/libfsimage/iso9660/Makefile index 4096cafa0c..c07183ba3e 100644 --- a/tools/libfsimage/iso9660/Makefile +++ b/tools/libfsimage/iso9660/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_iso9660.c @@ -11,5 +12,3 @@ all: fs-all install: fs-install fsys_iso9660.c: iso9660.h - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/reiserfs/Makefile b/tools/libfsimage/reiserfs/Makefile index 57f286b256..6f01e06a28 100644 --- a/tools/libfsimage/reiserfs/Makefile +++ b/tools/libfsimage/reiserfs/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_reiserfs.c @@ -9,5 +10,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/ufs/Makefile b/tools/libfsimage/ufs/Makefile index c1371080f5..116edd6b16 100644 --- a/tools/libfsimage/ufs/Makefile +++ b/tools/libfsimage/ufs/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_ufs.c @@ -9,5 +10,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/xfs/Makefile b/tools/libfsimage/xfs/Makefile index 6580007404..ce39ce5b24 100644 --- a/tools/libfsimage/xfs/Makefile +++ b/tools/libfsimage/xfs/Makefile @@ -1,4 +1,5 @@ XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk LIB_SRCS-y = fsys_xfs.c @@ -9,5 +10,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk diff --git a/tools/libfsimage/zfs/Makefile b/tools/libfsimage/zfs/Makefile index 9fb0aabe78..89a5e6e024 100644 --- a/tools/libfsimage/zfs/Makefile +++ b/tools/libfsimage/zfs/Makefile @@ -23,6 +23,7 @@ # XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/libfsimage/Rules.mk CFLAGS += -DFSYS_ZFS -DFSIMAGE -I$(XEN_ROOT)/tools/libfsimage/zfs LIB_SRCS-y = zfs_lzjb.c zfs_sha256.c zfs_fletcher.c fsi_zfs.c fsys_zfs.c @@ -34,5 +35,3 @@ all: fs-all .PHONY: install install: fs-install - -include $(XEN_ROOT)/tools/libfsimage/Rules.mk -- 2.30.2